Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge-develop-to-public #835

Merged
merged 312 commits into from
Aug 23, 2024
Merged

Conversation

dhriaznov
Copy link
Contributor

Created by merge-to-remote.sh

fedeerbes and others added 30 commits July 17, 2024 14:20
* chore: add basic skeleton for swap screen and flow entry points

* chore: move satsToBtcString to an util file

* chore: allow to close sheet when clickling in the overlay

* chore: make loading optional and default to false in TokenTile component

* feat: add from bottomsheet and tweak components to work together
* chore: add basic skeleton for swap screen and flow entry points

* feat: get quote modal

* fix: localisation

* remove console logs

* utxo provider subtitle logic

---------

Co-authored-by: fede erbes <[email protected]>
* chore: add basic skeleton for swap screen and flow entry points

* chore: move satsToBtcString to an util file

* chore: allow to close sheet when clickling in the overlay

* chore: make loading optional and default to false in TokenTile component

* feat: add from bottomsheet and tweak components to work together

* chore: add left accessory to input component

* chore: add hide balance prop to token tile component

* feat: add to token bottomsheet

* chore: adjust api calls to use rune id instead of rune name

* chore: move Container styles to string literal form
* Quote Summary screen

* WIP

* fetch quotes from input data

* WIP 2

* WIP 3

* chore: use TokenImage in QuoteTile and fix some styling

* chore: remove todo

---------

Co-authored-by: Abdul Haseeb <[email protected]>
Co-authored-by: fede erbes <[email protected]>
chore: add feature flag, swap pair, form validations and empty and error states
Fix quote order, subtitle and subtitle colour
* chore: add wording for no tokens found

* fix: provider selection dismiss in quote screen
* Fix glowing LP FEE

* WIP

* chore: add mapFTNativeSwapTokenToTokenBasic to utils

* chore: move place order into quote summary component

* More Robust arrow centering css

* Edit Fee Rate

* Snackbar error

* listen to placeOrderError

* feat: add place and execute order methods for amm providers

* chore: update core version

* chroe: clean up

---------

Co-authored-by: fede erbes <[email protected]>
* [ENG-4343] SEND BTC Transaction review screen - New Design

* touchup

* add address

* add address

* Update the Tx review screen titles

* Make some copy/ui tweaks

* Make some copy/ui tweaks

* Update the tx inputs/outputs icons

* Move the signBatchPsbtRequest styles to a separate file

* Make some text style tweaks for tx inputs/outputs

* Update the batch psbt tx review screen ui

* Add some hovers and localization

* Add some localization

* Update the UI for the external btc send txs

* Make some ui tweaks

* duplicate new component, revert previous changes

* remove duplicated components

* remove duplicated components

* Update the action buttons container for batch psbt signing

* Update the action buttons container for batch psbt signing

* Fix padding

* Remove the unused css

* Add a warning when there are external inputs

* touchup external input logic

* updated directory, import logic

* fixes - put btc transaction on top and add dividers for runes

* add new design

* remove todo

* fix reviews

* new send/receive ordinals & runes screens (#392)

* fix cancel behavior

* make recipientSelector.tsx a common component

* remove comment

* initial commit

* remove debugs

* remove debugs

* touchup

* revert

* add address

* update e2e

* restore lock file

* restore lock file

* touchup

* combine to always display bundle

* fix

* remove

* touchup

* touchup

* revert original logic

* ensure bundle always displays on non external input flow

* remove todo

* remove unnecessary logic in no-external input flow

* revert some changes

* finalize send ordinals

* add bundle for send runes for no external input flow

* touchup receive section

* use latest core

* rename standard

* Add type imports

* commit changes (#404)

* fix QA issues for release  (#408)

* fix QA issues

* add runes protocol logo to bundle

* E2etest/transaction screen (#406)

*Add data-testIds
* Fix STX Transaction E2E test
* Update Send Flows
* Add Send Runes flow
---------

Co-authored-by: Terence Ng <[email protected]>

---------

Co-authored-by: Terence Ng <[email protected]>
Co-authored-by: Eduard Bardají Puig <[email protected]>
Co-authored-by: Christine Pinto <[email protected]>
fedeerbes and others added 24 commits August 14, 2024 14:33
chore: merge develop into release v0.40.0
…r-runes-via-sats-connect

transfer runes request
* change deprecated method

* update lock

* update

* remove log
…s-regression

fix mint/etch api validation error
…ngs-1-ext-settings-homepage

Settings Screen revamp
* update quote warning copy

* fix: copy

Co-authored-by: fede erbes <[email protected]>

---------

Co-authored-by: fede erbes <[email protected]>
* style fixes

* fix default extension toggle flicker

* Update src/app/screens/settings/settingComponent/index.tsx

* touchup

* fix type

* fix divider in preference settings

---------

Co-authored-by: Terence Ng <[email protected]>
* [ENG-4948] fix: Add caching for the useChromeLocalStorage hook

* added settings component spinner

* Make some code tweaks

* Do not refetch useChromeLocalStorage on window focus

---------

Co-authored-by: Mahmoud Aboelenein <[email protected]>
@dhriaznov dhriaznov requested a review from a team as a code owner August 23, 2024 11:09
Copy link

@dhriaznov dhriaznov merged commit 7c5a8e7 into develop Aug 23, 2024
10 checks passed
@dhriaznov dhriaznov deleted the chore/merge-develop-to-public-1724411378 branch August 23, 2024 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.